Unset the clip mask for the GC if we set it. (Patch from Lars Hamann

Wed Feb 24 19:08:51 1999  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkclist.c (draw_cell_pixmap): Unset the clip
	mask for the GC if we set it. (Patch from
	Lars Hamann <lars@gtk.org>)

diff --git a/ChangeLog b/ChangeLog
index 4195ed691737a82a3e500ddedd558fb61a462e82..a4e3c9b0d797998e9a1423e0d65e7b229a3403f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb 24 19:08:51 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkclist.c (draw_cell_pixmap): Unset the clip
+       mask for the GC if we set it. (Patch from
+       Lars Hamann <lars@gtk.org>)
+
 Thu Feb 24 23:58:44 1999  Tim Janik  <timj@gtk.org>
 
        * gtk/gtksignal.c (gtk_signal_handler_pending_by_id): added function

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 4195ed691737a82a3e500ddedd558fb61a462e82..a4e3c9b0d797998e9a1423e0d65e7b229a3403f5 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Wed Feb 24 19:08:51 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkclist.c (draw_cell_pixmap): Unset the clip
+       mask for the GC if we set it. (Patch from
+       Lars Hamann <lars@gtk.org>)
+
 Thu Feb 24 23:58:44 1999  Tim Janik  <timj@gtk.org>
 
        * gtk/gtksignal.c (gtk_signal_handler_pending_by_id): added function

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4195ed691737a82a3e500ddedd558fb61a462e82..a4e3c9b0d797998e9a1423e0d65e7b229a3403f5 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Wed Feb 24 19:08:51 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkclist.c (draw_cell_pixmap): Unset the clip
+       mask for the GC if we set it. (Patch from
+       Lars Hamann <lars@gtk.org>)
+
 Thu Feb 24 23:58:44 1999  Tim Janik  <timj@gtk.org>
 
        * gtk/gtksignal.c (gtk_signal_handler_pending_by_id): added function

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 4195ed691737a82a3e500ddedd558fb61a462e82..a4e3c9b0d797998e9a1423e0d65e7b229a3403f5 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Wed Feb 24 19:08:51 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkclist.c (draw_cell_pixmap): Unset the clip
+       mask for the GC if we set it. (Patch from
+       Lars Hamann <lars@gtk.org>)
+
 Thu Feb 24 23:58:44 1999  Tim Janik  <timj@gtk.org>
 
        * gtk/gtksignal.c (gtk_signal_handler_pending_by_id): added function

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4195ed691737a82a3e500ddedd558fb61a462e82..a4e3c9b0d797998e9a1423e0d65e7b229a3403f5 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Wed Feb 24 19:08:51 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkclist.c (draw_cell_pixmap): Unset the clip
+       mask for the GC if we set it. (Patch from
+       Lars Hamann <lars@gtk.org>)
+
 Thu Feb 24 23:58:44 1999  Tim Janik  <timj@gtk.org>
 
        * gtk/gtksignal.c (gtk_signal_handler_pending_by_id): added function

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4195ed691737a82a3e500ddedd558fb61a462e82..a4e3c9b0d797998e9a1423e0d65e7b229a3403f5 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Wed Feb 24 19:08:51 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkclist.c (draw_cell_pixmap): Unset the clip
+       mask for the GC if we set it. (Patch from
+       Lars Hamann <lars@gtk.org>)
+
 Thu Feb 24 23:58:44 1999  Tim Janik  <timj@gtk.org>
 
        * gtk/gtksignal.c (gtk_signal_handler_pending_by_id): added function

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4195ed691737a82a3e500ddedd558fb61a462e82..a4e3c9b0d797998e9a1423e0d65e7b229a3403f5 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Wed Feb 24 19:08:51 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkclist.c (draw_cell_pixmap): Unset the clip
+       mask for the GC if we set it. (Patch from
+       Lars Hamann <lars@gtk.org>)
+
 Thu Feb 24 23:58:44 1999  Tim Janik  <timj@gtk.org>
 
        * gtk/gtksignal.c (gtk_signal_handler_pending_by_id): added function

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 5b2d4bd213ec84ae86866ab3563fef5234b1f785..02aa3c45ec558583f4d0be0058995d3dacaca188 100644 (file)
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -5566,6 +5566,8 @@ draw_cell_pixmap (GdkWindow    *window,
 
   gdk_draw_pixmap (window, fg_gc, pixmap, xsrc, ysrc, x, y, width, height);
   gdk_gc_set_clip_origin (fg_gc, 0, 0);
+  if (mask)
+    gdk_gc_set_clip_mask (fg_gc, NULL);
 
   return x + MAX (width, 0);
 }